button
Merge branch 'develop' of https://github.com/zyeeda/colorvest-samples into develop

Conflicts:
	modules/demo/todo.coffee