Teleport orb
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project3/Library/CurrentLayout.dwlt
	Project3/Library/CurrentMaximizeLayout.dwlt
	Project3/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project3/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project3/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll

	Project3/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Project3/Library/ScriptMapper
	Project3/Library/assetDatabase3
	Project3/Library/guidmapper
	Project3/Library/metadata/4c/4c85abd0a4d974473b97e81d10a3a6bc
	Project3/Library/metadata/4e/4ed9e11f8fac9f1439318e8e18ad9cb6
	Project3/Library/metadata/5a/5a09dad89d11389ed000e82b8d76c639
	Project3/Library/metadata/b4/b4f3771578b1cc042a892835af05c176
	Project3/Library/metadata/b7/b72170d9e15c0614795cb625beb381ae
	Project3/Library/metadata/e8/e83c2f831bb0fd14b92751cdcbe823ec
	Project3/Library/shadercompiler-1.log
	Project3/Project3-csharp.sln
	Project3/Project3.sln
	Project3/Project3.userprefs