password
Merge branches 'develop' and 'develop' of https://github.com/zyeeda/colorvest-samples into develop

Conflicts:
	app/main.coffee

textarea(cols属性还有问题)
Merge branch 'develop' of https://github.com/zyeeda/colorvest-samples into develop

Conflicts:
	app/main.coffee
Merge
Merge branches 'develop' and 'develop' of https://github.com/zyeeda/colorvest-samples into develop
修改代码