s
Merge branch 'master' of https://github.com/enginedev/gameengine

Conflicts:
	gameengine/.cproject
	
- added glm header only math lib
- matrix tests