更新配置
Merge branch 'demo' of https://github.com/spheee/tc-touch into sp-demo

Conflicts:
	app/demo/common/header/index.html
	index.js
	tch-conf.js
Merge pull request #5 from gerdy/demo

Demo