dodgy view fixed
Merge branch 'pageviews' into testing