add button change template
Merge branch 'master' of https://github.com/CartoDB/odyssey.js

Conflicts:
	editor/css/screen.css