fixed some prefabs
Merge branch 'master' of https://github.com/timmyterrezza/EGDP2

Conflicts:
	Game/Assembly-CSharp-vs.csproj
	Game/Assembly-UnityScript-vs.unityproj
	Game/Assets/Resources/Scenes/Level1R.unity
Merge branch 'master' of https://github.com/timmyterrezza/EGDP2

Conflicts:
	Game/Assembly-CSharp-vs.csproj
	Game/Assembly-UnityScript-vs.unityproj