Merge branch 'HEAD', remote branch 'origin'
Merge branch 'master' of https://github.com/msnbc-devices/TODAYdotApp-WebTemplates
Unifying Android and iOS video templates
Cleaned up old android video template