Merge pull request #8 from rtsuk/master

pulling master down to fork
Merge pull request #9 from spacedockapp/master

Merging master down to fork
Shelving progress
Shelving changes.
Fleet Captains in plain text format

Label fleet captains like flagships in the plain text format intended for pasting into emails or message boards. Fixes #121.
Shelving changes
shelving changes, caught up to wave 7
Merge pull request #122 from tblackwe/master

Catching Android up to wave 7
Merge pull request #10 from spacedockapp/master

Merging master down to fork
Implementing Assimilated Prime
Merge pull request #123 from tblackwe/master

Assimilated Prime/Stargazer
Add a zero cost mirror universe captain.
Fleet Captains don't pay a faction penalty.
Fix some data model edge cases

Bring in the Factioned interface from Objective C. Fixes #106.
Implement fleet captain additional slots.
Have the Fleet Captain error messages match the other platforms.
Added Weapon Slot and Titles

Add addoneweaponslot to the list of handled specials and specials that change slots.

Implement disambiguated titles for Android.
Get ready for an Android test release.
New Mac release.
Missed a special.
External IDs can be null.
RiF Boosters