Merge pull request #1 from trailheadlabs/development

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

Play store
Merge branch 'master' into development
quick commit 2014-12-18 00:19:29
Merge branch 'master' into development
versioning to 1.5.1