small changes to analytics
Merge branch 'prod' of https://github.com/ssachan/v2 into prod

Conflicts:
	client/js/models/questions.js