comm
Merge branch 'master' of https://github.com/penjurov/TeamGeorgeOrwell

Conflicts:
	RPG/RPG.v12.suo
	RPG/RPG/RPG/obj/x86/Debug/Rpg.csproj.FileListAbsolute.txt
	RPG/RPG/RPGContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
d
Merge branch 'master' of https://github.com/penjurov/TeamGeorgeOrwell.git