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

Conflicts:
	CR4VE/CR4VE.v11.suo
	CR4VE/CR4VE/CR4VE/CR4VE.csproj.Debug.cachefile
	CR4VE/CR4VE/CR4VEContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
nb nc m,n
Merge branch 'master' of https://github.com/KleinerMensch/CR4VE

Conflicts:
	CR4VE/CR4VE.v11.suo
	CR4VE/CR4VE/CR4VE/CR4VE.csproj.Debug.cachefile
	CR4VE/CR4VE/CR4VEContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
jhfjg
Merge branch 'master' of https://github.com/KleinerMensch/CR4VE

Conflicts:
	CR4VE/CR4VE.v11.suo
hvh
Merge branch 'master' of https://github.com/KleinerMensch/CR4VE

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