analytics
Merge branch 'development'

Conflicts:
	views/layout.html
Merge branch 'master' into development