更新
Merge branch 'daily/0.0.1' into demo

Conflicts:
	app/assets/lib/config.js
	app/modules/tc/detail/index.js
	app/modules/tc/search/index.js
	app/modules/tpl/tag/index.js
	tch-conf.js