Merge branch 'origin/master'

Conflicts:
	gameplay demo/Library/CurrentLayout.dwlt
	gameplay demo/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	gameplay demo/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	gameplay demo/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	gameplay demo/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	gameplay demo/Library/ScriptAssemblies/Assembly-CSharp.dll
	gameplay demo/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	gameplay demo/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	gameplay demo/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	gameplay demo/Library/assetDatabase3
	gameplay demo/Library/guidmapper
	gameplay demo/Library/metadata/82/82b9f9e72bfb3bc4ea77e8ffc4c07e18
	gameplay demo/gameplay demo-csharp.sln
	gameplay demo/gameplay demo.sln