More changes!
Merge remote-tracking branch 'origin/master'

Conflicts:
	Unity/Library/assetDatabase3
Merge branch 'master' of https://github.com/picoriley/cloaked-octo-bugfixes

Conflicts:
	Unity/Library/ScriptAssemblies/Assembly-CSharp.dll
	Unity/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Unity/Library/assetDatabase3