Merge branch 'master' into develop
Fix the homepage layout
Merge branch 'develop'
Merge branch 'master' into gh-pages