Merge pull request #11 from spacedockapp/master

merging
Merge pull request #12 from spacedockapp/master

Head down to fork.
Making officers crew
Merge remote-tracking branch 'origin/master'

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

Moving officers to crew
Shelving changes, reverting data.xml change.
data file mods and implementing missing slots
Merge pull request #136 from tblackwe/master

Implementing wave 8 and AoT