Analytics working
Merge branch 'analytics'

Conflicts:
	assets/www/js/views.js