Fixed upstream merged
Merge branch 'sendErrorsToAnalytics' of https://github.com/GoogleChrome/text-app into sendErrorsToAnalytics

Conflicts:
	js/analytics.js
	js/app.js