comments #36 - renamed notifications to alertsettings

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
Merge branch 'develop' into notifications
Merge branch 'notifications' into develop