commit
Merge branch 'dev' of ssh://github.com/Joda89/xsilium-engine into dev

Conflicts:
	SceneLoader/CMakeLists.txt
	SceneLoader/SceneLoader.h