[added orange labyrinth]
Merge branch 'master' of https://github.com/martacabaj/Cube

Conflicts:
	Assembly-CSharp-firstpass-vs.csproj
	Assembly-CSharp-firstpass.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assembly-UnityScript-firstpass-vs.unityproj
	Assembly-UnityScript-firstpass.unityproj
	Assets/TryOpenCv.cs
	Cube-csharp.sln
	Cube.sln
	Cube.userprefs
	Temp/__EditModeScene