Error handling
Merge branch 'master' into error-handling

Conflicts:
	app/index.js
Merge pull request #309 from mozilla/error-handling

Error handling