Commit
Merge branch 'master' of https://github.com/KoPaB/Ninja-vs-Trolls

Conflicts:
	Game/Game.csproj.user
	Game/bin/Game.dll
	Game/bin/Game.pdb
	Game/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Game/obj/Debug/Game.dll
	Game/obj/Debug/Game.pdb