Shit from VS 13
Merge branch 'dev' of https://github.com/rpauls/SAE-NoMoreTeaTime into dev

Conflicts:
	Classes/Scenes/SceneDevSandbox.cpp