weapon, color
Merge branch 'origin/Hieu'

Conflicts:
	Assets/Anarchy.fbm.meta
	Assets/RacingGame/Scripts/Andrew/networkManager.cs
	Library/CurrentLayout.dwlt
	Library/EditorUserBuildSettings.asset
	Library/InspectorExpandedItems.asset
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/12/12e164431dbd8714bbde0aeef453b764
	Library/metadata/32/32d0e0d3889749240b868d557a1d79b6
	Library/metadata/96/96bb34b09c4d9a14eb383534720acd1a
	Library/metadata/d9/d9a637e69b9f0a7449ee6b6e158ddd5b
	Library/metadata/e5/e5872d120b1f7544da8341df703860d4
	Library/metadata/e7/e76d0bdab6849b94aa507497bbb96687