weqeqwe
Merge branch 'master' of github.com:Isht/simpkb

Conflicts:
	assets/js/app/view/ribbonmenu/Administrasi.js
	assets/js/app/view/ribbonmenu/Laporan.js
	assets/simpkb_db.sql