before pull of release-1.4
Merge branch 'release-1.4' of github.com:sk8geek/timer into release-1.3

Conflicts:
	AndroidManifest.xml
compiles, test on device
haptic still to do
before jump to release 1.5