sliders
Merge remote-tracking branch 'origin/master'

Conflicts:
	UnityProject/Library/CurrentMaximizeLayout.dwlt
	UnityProject/Library/ScriptAssemblies/Assembly-UnityScript.dll
	UnityProject/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	UnityProject/Library/assetDatabase3
	UnityProject/Library/guidmapper