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

Conflicts:
	assets/js/app/view/divstockopname/divsoForm.js