Revert 4f6abb2..f1efe41

This rolls back to commit 4f6abb264b16d4e3798b703187a322a13448f679.
Sync & Commit
Merge branch 'master' of https://github.com/DarkOmega/VRJam2014

Conflicts:
	VRJam2014/Assembly-UnityScript-Editor-vs.unityproj
	VRJam2014/Assembly-UnityScript-Editor.unityproj
	VRJam2014/Assets/Art.unity
	VRJam2014/Assets/Prefabs/MainScene.prefab