Commit before sync
Merge branch 'master' of https://github.com/Isht/gl

Conflicts:
	application/controllers/persediaan.php