jfj
Merge branch 'master' of https://github.com/KleinerMensch/CR4VE

Conflicts:
	CR4VE/CR4VE/CR4VE/CR4VE.csproj.Debug.cachefile
	CR4VE/CR4VE/CR4VEContent/CR4VEContent.contentproj
	CR4VE/CR4VE/CR4VEContent/obj/x86/Debug/CR4VEContent.contentprojResolveAssemblyReference.cache
	CR4VE/CR4VE/CR4VEContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache