*Some changes at weaponchanging(still not working)
Merge branch 'babucke-dev'

Conflicts:
	Unity/Assets/OnQ Nature Pack 2 v2/Foliage Set 2/Trees/Aspen 1.prefab
	Unity/Assets/OnQ Nature Pack 2 v2/Foliage Set 2/Trees/Aspen 2.prefab
	Unity/Assets/OnQ Nature Pack 2 v2/Foliage Set 2/Trees/Aspen 3.prefab
	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/metadata/60/60bca8f58a0b8478e946e6e86658cb29