Merge branch 'release/v2.0' into develop
ready to attack label and skull bug
added 30 min update period for testing
eliminated check for configuration complete.  Alarm does get stopped when startup cancelled.  Testing longterm on tablet now.
cleaned up comments
moved preview.png to drawable-mdpi as recommended by lint
Merge branch 'feature/bugfix' into develop
bumped version to 2.1
Merge branch 'release/v2.1'