Merge remote-tracking branch 'origin/master'

Conflicts:
	UnityStuff/Assets/scene.unity
	UnityStuff/Library/ScriptAssemblies/Assembly-CSharp.dll
	UnityStuff/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	UnityStuff/Library/ScriptAssemblies/Assembly-UnityScript.dll
	UnityStuff/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	UnityStuff/Library/assetDatabase3
	UnityStuff/Library/guidmapper
	UnityStuff/Library/shadercompiler-1.log
	UnityStuff/UnityStuff.userprefs