jupp
Merge remote-tracking branch 'origin/master'

Conflicts:
	New Unity Project/Assembly-CSharp-vs.csproj
	New Unity Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	New Unity Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	New Unity Project/Library/assetDatabase3
	New Unity Project/Library/guidmapper
	New Unity Project/Library/metadata/a1/a14a9ed31960495419e19a6fe3593d70
	New Unity Project/Library/metadata/f0/f024e04575287e445bf6a9511ffc35d6
	New Unity Project/Library/metadata/fd/fd86c6cf3a3f15644a06fd654bff05bf