Merge branch 'hotfix/zf2-2-1-update'
Added ZendCon promo banner

- Had to update CSS so that divider was correctly sized to right-content
Merge branch 'hotfix/zendcon-promo' into develop