Added Affiliate id and sku to product id, update alerts
Updated trend: Shopping; Updated alerts
Merge branch 'staging'