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

Conflicts:
	application/controllers/persediaan.php
	assets/js/app/model/PengadaanDetailModel.js