pull
Merge branch 'master' of https://github.com/TRWirahmana/hukor

Conflicts:
	.idea/workspace.xml
validasi registrasi user baru sisi admin, ketika NIP dan emailnya sudah exist. dinamis sub bagian
Merge branch 'master' of https://github.com/TRWirahmana/hukor

Conflicts:
	.idea/workspace.xml
	app/controllers/AdminController.php