updating metrics
Merge branch 'master' of https://github.com/BrightcoveLearning/analytics-api

Conflicts:
	apiary.apib