调整文件结构
Merge branch 'develop' of https://github.com/zyeeda/colorvest-samples into develop

Conflicts:
	app/main.coffee