undo change of name of choice 'No comment'. Fixed problem with save of alarms.
Merge remote-tracking branch 'origin/master'