fix several text
Merge branch 'master' of https://github.com/CartoDB/odyssey.js

Conflicts:
	dist/editor.js