Making officers crew
Merge remote-tracking branch 'origin/master'

Conflicts:
	android/app/src/main/assets/data.xml

Moving officers to crew