Add Google analytics tracking
Merge branch 'master' into analytics

Conflicts:
	docs/assets/js/angular.js