Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	MyGame/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache