yes, yes :shipit:
Merge branch 'fixit'
alerts load from server
Merge branch 'master' of https://github.com/OrangeDreamTeam/WebApp
Merge branch 'alerts'