add confirmation before delete alarm or event
add possibility to cancel edition mode in alarms views
move up in edition mode
debug travis tests
Merge pull request #46 from aenario/omaster

make tests run with latest DS
Merge remote-tracking branch 'zoe/master' into omaster