Fixed it?
Merge branch 'master' of https://github.com/schwin42/VRG

Conflicts:
	Assets/Prefabs/2D Ragdolls/ObjDisplayContainer.prefab
	Assets/Prefabs/2D Ragdolls/ObjDisplayContainer.prefab.meta
	Assets/Prefabs/2D Ragdolls/character.prefab
	Assets/Prefabs/2D Ragdolls/character.prefab.meta
	Assets/Prefabs/2D Ragdolls/inputCharacter.prefab
	Assets/Prefabs/2D Ragdolls/inputCharacter.prefab.meta
	Assets/Prefabs/2D Ragdolls/objectLargeBox.prefab
	Assets/Prefabs/2D Ragdolls/objectLargeBox.prefab.meta
	Assets/Prefabs/2D Ragdolls/objectSmallBox.prefab
	Assets/Prefabs/2D Ragdolls/objectSmallBox.prefab.meta
	Assets/Prefabs/2D Ragdolls/room01.prefab
	Assets/Prefabs/2D Ragdolls/room01.prefab.meta
	Assets/Prefabs/RPG/ObjDisplayContainer.prefab
	Assets/Prefabs/RPG/ObjDisplayContainer.prefab.meta
	Assets/Prefabs/Ragdolls/2D/character.prefab
	Assets/Prefabs/Ragdolls/2D/character.prefab.meta
	Assets/Prefabs/Ragdolls/2D/inputCharacter.prefab
	Assets/Prefabs/Ragdolls/2D/inputCharacter.prefab.meta
	Assets/Prefabs/Ragdolls/2D/objectLargeBox.prefab
	Assets/Prefabs/Ragdolls/2D/objectLargeBox.prefab.meta
	Assets/Prefabs/Ragdolls/2D/objectSmallBox.prefab
	Assets/Prefabs/Ragdolls/2D/objectSmallBox.prefab.meta
	Assets/Prefabs/Ragdolls/2D/room01.prefab
	Assets/Prefabs/Ragdolls/2D/room01.prefab.meta
	Assets/Prefabs/Ragdolls/ObjDisplayContainer.prefab
	Assets/Prefabs/Ragdolls/ObjDisplayContainer.prefab.meta
	Assets/Prefabs/Ragdolls/character.prefab
	Assets/Prefabs/Ragdolls/character.prefab.meta
	Assets/Prefabs/Ragdolls/inputCharacter.prefab
	Assets/Prefabs/Ragdolls/inputCharacter.prefab.meta
	Assets/Prefabs/Ragdolls/objectLargeBox.prefab
	Assets/Prefabs/Ragdolls/objectLargeBox.prefab.meta
	Assets/Prefabs/Ragdolls/objectSmallBox.prefab
	Assets/Prefabs/Ragdolls/objectSmallBox.prefab.meta
	Assets/Prefabs/Ragdolls/room01.prefab
	Assets/Prefabs/Ragdolls/room01.prefab.meta