Merge remote-tracking branch 'origin/master'

Conflicts:
	New Unity Project 6/Library/CurrentLayout.dwlt
	New Unity Project 6/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	New Unity Project
6/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	New Unity Project 6/Library/ScriptAssemblies/Assembly-CSharp.dll
	New Unity Project 6/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	New Unity Project 6/Library/assetDatabase3
	New Unity Project 6/Library/guidmapper
	New Unity Project
6/Library/metadata/6b/6bdf672a41822614b887d2d1012f59c0
	New Unity Project 6/New Unity Project 6-csharp.sln
	New Unity Project 6/New Unity Project 6.sln
Merge remote-tracking branch 'origin/master'

Conflicts:
	New Unity Project 6/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	New Unity Project 6/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	New Unity Project 6/Library/ScriptAssemblies/Assembly-CSharp.dll
	New Unity Project 6/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	New Unity Project 6/Library/UnityAssemblies/UnityEditor.Graphs.dll
	New Unity Project 6/Library/UnityAssemblies/UnityEditor.dll
	New Unity Project 6/Library/assetDatabase3
	New Unity Project 6/Library/guidmapper
	New Unity Project 6/New Unity Project 6-csharp.sln
	New Unity Project 6/New Unity Project 6.sln