Merge remote-tracking branch 'chris/master'
Merge remote-tracking branch 'forry/master'
Contains HomePageView
Merge remote-tracking branch 'numberQ/master'