Merge branch 'alerts' into 'master'

Added alert functionality

See merge request !92
3 jobs for master in 59 seconds (queued for 5 seconds)