Merge pull request #7 from 9034725985/dev

Update README.md
Reset and cancel timer from notification

When tapping the timer button while the timer is running - rather than restart.

Signed-off-by: Mike Beattie <mike@ethernal.org>
persist timer status over reboot; fixes #8
split 'hide app' settings from 'start ingress'; fixes #9
Editing and diplaying hour-long timers without confusions
renamed isCorrectCooldownString() method to isValidCooldownString()
made ternary operators more readable
refactored format variable to express its purpose better
fixed indentation to conform with project code style
Changed the way time is formatted. Doing it with Date format makes it dependent on Locale.
Make Tap to Cancel in notification a preference

Signed-off-by: Mike Beattie <mike@ethernal.org>
Merge remote-tracking branch 'upstream/master'
Merge pull request #11 from mcveat/hour-timer

Editing and diplaying hour-long timers without confusions
Spelling in default strings file.
Merge pull request #12 from CoatedMoose/patch-1

Spelling in default strings file.
Merge branch 'master' of github.com:mjbnz/portal-timer

Conflicts:
	src/de/ub0r/android/portaltimer/Timer.java
format code
fix settings dependencies
bump to PortalTimer v1.4
Merge pull request #2 from felixb/master

Pull latest changes to stay in sync.