Merging with Kim's computer
Merge branch 'master' of https://github.com/qimmer/mta13341

Conflicts:
	Unity_Project/Library/CurrentLayout.dwlt
	Unity_Project/Library/CurrentMaximizeLayout.dwlt
	Unity_Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	Unity_Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Unity_Project/Library/assetDatabase3
	Unity_Project/Unity_Project-csharp.sln
	Unity_Project/Unity_Project.sln