Dries: some changes
Merge branch 'master' of https://github.com/frostraver/Ip2_Concept2

Conflicts:
	XNA_DEMOContent/XNA_DEMOContent.contentproj
	XNA_ENGINE/Game/Scenes/GameSceneConcept2.cs
	XNA_ENGINE/XNA_ENGINE.csproj.Debug.cachefile