Merge branch 'hotfix/v1.2.1' into develop
added new timescales
changed order of buttons in configure
add HOURS timescale.  Need to add local formatting (e.g. 31,000, not 31000)
in middle of HOURS feature
commiting bad stuff
changed background widget
changed preview.png.  Widget too small on Nexus 7
finishing branch hours for now
Merge branch 'feature/hours' into develop
off on a tangent
Merge branch 'feature/darktheme' into develop
Merge branch 'feature/alarmmanager' into develop
more random changes to sort out
merged conflicting trees
fixed arrays.xml
changed widget.xml back to smaller height.  May need to experiment with this for tablet version
before MorbidMeterClock
added MorbidMeterClock class
working on clock, not sure if allow power lock or not, or leave it as an option