Merge branch 'main' into development

# Conflicts:
#	application/controllers/Aksi.php
#	application/controllers/Home.php
#	application/views/cetak/output.php
#	application/views/form/wizard.php
#	application/views/home.php
#	application/views/menu/siswa/lihat.php
