final
Merge branch 'Simon' into merge

Conflicts:
	Editor/Editor.userprefs
	Editor/Library/CurrentLayout.dwlt
	Editor/Library/ScriptAssemblies/Assembly-CSharp.dll
	Editor/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Editor/Library/assetDatabase3