Changes for homepage and blog view
Merge branch 'develop'