Changes
Merge t push
:wq
branch 'master' of github.com:cuberob/Hackathon2014

* 'master' of github.com:cuberob/Hackathon2014:
  alarmmanager fixes
  Changed notification