ok al
Merge branch 'master' of https://github.com/zaiendi/akademik

Conflicts:
	adminweb/cek_login.php
	adminweb/modul/mod_nilai/aksi_nilai.php
	adminweb/modul/mod_nilai/nilai.php