Merge proposals dependent on lp://qastaging/~george-edison55/webapps-applications/quickmediasolutions

1. quickmediasolutions
2. Dependent merge proposals