Merge branch 'hotfix/zendcon-banner-removal'
Added ZendCon promo
Merge branch 'hotfix/zendcon-promo-august' into develop