12321
Merge branch 'master' of https://github.com/Isht/gl

Conflicts:
	application/controllers/persediaan.php
	assets/gldb.sql
	assets/js/app/controller/getDivBarangKeluar.js
	assets/js/app/controller/getInvBarangKeluar.js
	assets/js/app/view/divbarangkeluar/divbarangkeluarGrid.js
	assets/js/app/view/divbarangmasuk/divbarangmasukGrid.js
	assets/js/app/view/divmintabarang/divmintabarangGrid.js