Ad Manager Changes
Merge branch 'master' of https://github.com/TeamW/Deliverable-7