modified:   Unityproject/Library/CurrentLayout.dwlt
	modified:   Unityproject/Library/CurrentMaximizeLayout.dwlt
	modified:   Unityproject/Library/assetDatabase3
	modified:   Unityproject/Library/guidmapper
	modified:   Unityproject/Unityproject-csharp.sln
	modified:   Unityproject/Unityproject.sln
Merge remote-tracking branch 'origin/Nerzull'

Conflicts:
	Unityproject/Library/CurrentLayout.dwlt
	Unityproject/Library/CurrentMaximizeLayout.dwlt
	Unityproject/Library/assetDatabase3

	modified:   Unityproject/Library/guidmapper
	modified:   Unityproject/Unityproject-csharp.sln
	modified:   Unityproject/Unityproject.sln