test
Merge branch 'master' of https://github.com/tobsa/MechaSnapperEngine

Conflicts:
	ExampleGame/ExampleGame/Game1.cs
	GameEngine/GameEngine/Framework/EntityFactory.cs
Fixed