edit absensi
Merge branch 'origin/master'

Conflicts:
	protected/controllers/AbsensiController.php