Merge pull request #2 from gerdy/demo

Demo123
Merge pull request #3 from gerdy/demo

更新
holmesky提交  标签页
标签123
112:
历经千辛万苦好不容易重新找到代码
qwerty
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