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

Conflicts:
	assets/js/app/view/masteritem/getMasterItem.js