Removed 80% of code from HomePageController (and done other minor refactorings)
Merge remote-tracking branch 'origin/master'