Updated Alerts; Continued Asos; Uncommented line in support_controller
Merge branch 'staging'