*Weaponswitching not completed
Merge branch 'babucke-dev'

Conflicts:
	Unity/Library/CurrentLayout.dwlt
	Unity/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Unity/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Unity/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Unity/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Unity/Library/ScriptAssemblies/Assembly-UnityScript.dll
	Unity/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Unity/Library/assetDatabase3
	Unity/Library/expandedItems
	Unity/Library/guidmapper