Fixes #131
Merge ClassBasedViews and NewHomePage into master