Command and Fireteam management
Merge remote-tracking branch 'origin/master'

Conflicts:
	Unity_Project/Assembly-CSharp.pidb
	Unity_Project/Unity_Project.userprefs