Commit test

Commit van Evan
Merge remote-tracking branch 'origin/master'

Conflicts:
	obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	obj/Debug/WarGame.csproj.FileListAbsolute.txt