Fixed merge conflicts for homepage
Fixed Merge conflict for homepage content

Merge branch 'ab_homepage_ui'
Fixed merge conflict issue