set up the content boxes in homepage
Merge remote-tracking branch 'origin/master'