Fixed shader inconsistency which lead to a mixture of model-space and view-space coordinates..
Merge branch 'master' of https://github.com/happah-graphics/happah.git

Conflicts:
	src/main/gui/gl/DrawManager.cpp