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
Crew Rike is Crew.
New Mac release.
New iOS release.
New Android test release.
Crewman Riker should add a crew slot.
Update special test file.
Add a test for Crewman Riker
Implement Borg Alliance
Add the missing Picard.
Add the missing Picard.

Fixes #141.
Add missing Power Grid upgrade
Get rid of trailing comma
New Mac release.