Updated Alerts; Remove ASOS
Merge branch 'staging'