Cakez.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Spectrum/Library/ScriptAssemblies/Assembly-UnityScript.dll
	Spectrum/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Spectrum/Library/assetDatabase3
	Spectrum/Library/guidmapper
	Spectrum/Library/metadata/f2/f2bfc4fd283904fd7a28557c951548b3