Merge branch 'feature/887-subdomains'
re #679 - Added basic analytics dashboard
Merge branch 'feature/679-analytics' into staging