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

Conflicts:
	Client/XsiliumApp.cpp
	Engine/XsiliumFramework.cpp
	Engine/XsiliumFramework.h
Merge branch 'dev' of ssh://git@github.com/Joda89/xsilium-engine.git into dev