Commit to check conflict
Merge branch 'master' of https://github.com/Isht/simpkb

Conflicts:
	app/controllers/pembayaran.php
	app/controllers/pendaftaran.php
	app/controllers/report.php
	app/views/tpl_numpang_uji.php
	app/views/tpl_rekom.php
	assets/css/invoice_screen.css
	assets/js/app.js
	assets/js/app/controller/App.js
	assets/js/app/controller/administrasi/AdCtkRekom.js
	assets/js/app/view/administrasi/adctkrekom/AdTabelCtkRekom.js
	assets/js/app/view/ribbonmenu/Administrasi.js
	assets/simpkb_db.sql