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>
Make Tap to Cancel in notification a preference

Signed-off-by: Mike Beattie <mike@ethernal.org>
Merge remote-tracking branch 'upstream/master'
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