Return on keyboard dismisses keyboard
Merge branch 'master' of https://github.com/mstuart/samsung-android-hackathon

* 'master' of https://github.com/mstuart/samsung-android-hackathon:
  Added Custom Icon
Some UI tweakage on the home screen
Merge branch 'master' of https://github.com/mstuart/samsung-android-hackathon

* 'master' of https://github.com/mstuart/samsung-android-hackathon:
  remove unused var
  Enable haptics when the timer runs out