Add set/expansion browsing
Merge branch 'master' of https://github.com/rtsuk/spacedock

Conflicts:
	android/app/src/main/java/com/funnyhatsoftware/spacedock/fragment/DisplaySquadFragment.java
Fix expansion detail display on phones
Merge pull request #7 from rtsuk/master

sync master down to fork.
Adding code to include fleet captain cost.
Making fleet captain remove faction penalty from captains
updating to common interpretation of fleet captain rule
Merge pull request #107 from tblackwe/master

Fleet captain fix and possible fix
Fixed non-default constructor.
Cleaned up box drawing with stroke instead of lines
Made better use of canvas save/translate/restore
Created drawShip function
Pulled battle footer into its own function
Reordered imports and reformated to match style better
Fixed some other style issues
Added specialized Paints
Better use of canvas.save/restore
More functions
Changed functions to use passed canvas instead of returning Picture objects
Simplified page 2+ creation
Readjusted positioning
Style formatting fixes
Altered drawShipItem() slightly
Merge branch 'master' of github.com:rrgeorge/spacedock

Conflicts:
	android/app/src/main/java/com/funnyhatsoftware/spacedock/fragment/DisplaySquadFragment.java