#233 alarm commit
#233 final
#239 statistic collecting was removed
Merge remote-tracking branch 'origin/233-future-dates-filter' into develop
Merge remote-tracking branch 'origin/develop' into 185-backup-restore