Merge branch 'jeff-know3933'

Conflicts:
	analytics-api/analytics-by-tag.html
	analytics-api/js/analytics-by-tag.js
Updates
Merge branch 'jeff-know3933-2'