Updated Alerts for trend of the week; Updated Products_Controller for fix for marshalling error
Merge branch 'staging'