Siang
Merge branch 'master' of https://github.com/Isht/etrav_acc

Conflicts:
	.idea/workspace.xml
	application/controllers/akun.php
	assets/js/app/controller/getKasBon.js
	assets/js/app/view/kasbon/kbForm.js