-staged files
Merge branch 'master' of https://github.com/PFA-OpenGL/Demoscene-OpenGL

Conflicts:
	GameEngine/GameEngine/Demo/DemoScene.cpp