inventaris
Merge branch 'master' of https://github.com/coepoe/glapp

Conflicts:
	assets/js/app/view/ivlsterima/IvLsTerimaGrid.js
Merge branch 'master' of https://github.com/coepoe/glapp