Merge branch 'hotfix/zendcon13-cfp-removal'
Fix homepage layout
Merge branch 'hotfix/homepage' into develop