Merge
Merge branch 'master' of https://github.com/qimmer/mta13341

Conflicts:
	Unity_Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	Unity_Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Unity_Project/Library/guidmapper
	Unity_Project/Library/metadata/0c/0c01cca2e85194a4f899205b0c71f036
	Unity_Project/Library/metadata/fa/fa0e5bfc9c4fa5a48bc00ad5edfc5f4e
	Unity_Project/Library/metadata/fc/fc02ae41c9707614ea0050ec5733cea5