Merge pull request #1 from trailheadlabs/development

Development
stylefixes for android
code cleanup
Merge pull request #54 from etown/play-store

Play store