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

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

Conflicts:
	CR4VE/CR4VE/CR4VE/CR4VE.csproj.Debug.cachefile
	CR4VE/CR4VE/CR4VEContent/obj/x86/Debug/CR4VEContent.contentprojResolveAssemblyReference.cache
	CR4VE/CR4VE/CR4VEContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	CR4VE/CR4VE/SkinnedModel/bin/x86/Debug/SkinnedModel.dll
	CR4VE/CR4VE/SkinnedModel/bin/x86/Debug/SkinnedModel.pdb
Merge branch 'master' of https://github.com/KleinerMensch/CR4VE

Conflicts:
	CR4VE/CR4VE/CR4VE/CR4VE.csproj.Debug.cachefile
Merge branch 'master' of https://github.com/KleinerMensch/CR4VE

Conflicts:
	CR4VE/CR4VE/CR4VE/CR4VE.csproj.Debug.cachefile