Updates
Merge branch 'master' of https://github.com/BrightcoveLearning/BCL-Solutions

Conflicts:
	analytics-api/analytics-by-tag.html