UI
Merge branch 'master' of https://github.com/DarkOmega/VRJam2014

Conflicts:
	VRJam2014/Assembly-CSharp-firstpass-vs.csproj
	VRJam2014/Assembly-CSharp-firstpass.csproj
	VRJam2014/Assembly-UnityScript-firstpass-vs.unityproj
	VRJam2014/Assembly-UnityScript-firstpass.unityproj
	VRJam2014/ProjectSettings/Physics2DSettings.asset