New homepage feature
Merge branch 'vic-branch2'