Ad Platform

Merge branch 'master' into feature/cross-origin-vast