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.
Shelving changes
shelving changes, caught up to wave 7
Merge pull request #122 from tblackwe/master

Catching Android up to wave 7