namespace refactor
Merge branch 'master' of https://github.com/gmich/GameEngine2D.git