.
Merge remote-tracking branch 'origin/master'

Conflicts:
	RPG Game/RPGGame/UI/RPGGameMenu.cs
	RPG Game/RPGGame/obj/Debug/DesignTimeResolveAssemblyReferences.cache