Merg Merg Merg
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/Library/guidmapper
	Unity_Project/Library/metadata/46/463c26274335b9b45b9f28914f53684c
	Unity_Project/Library/metadata/a5/a5076bd6612771a419f24736167d86d1
	Unity_Project/Library/metadata/b0/b018118f66b38d448a12805628ccd819
	Unity_Project/Unity_Project-csharp.sln
	Unity_Project/Unity_Project.sln