Alerts updated with sodium and weight alerts
Merge branch 'alerts' into dev