Fixed non-default constructor.
Merge remote-tracking branch 'rtsuk/master'
Removed unnecessary imports.
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
Merge pull request #107 from tblackwe/master

Fleet captain fix and possible fix
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
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
Merge pull request #102 from rrgeorge/master

Fixed non-default constructor, cleans up printing code, fixes Issue 105
Import Wave 7

Also implemented the "not with Hugh" restriction for the previous wave.
New Mac release.
New iOS test release.
Merge pull request #8 from rtsuk/master

pulling master down to fork