Merge pull request #7 from gerdy/demo

合并拉
电话号码
更新结构
Merge pull request #5 from spheee/demo

Demo
Merge branch 'demo' of github.com:gerdy/tc-touch into demo

Conflicts:
	app/modules/tc/list/index.js
Merge branch 'bak' into demo

Conflicts:
	app/assets/lib/config.js
	app/modules/tc/list/index.js
	tch-conf.js
更新整体结构
Merge pull request #8 from gerdy/demo

123
新电话号码
Merge pull request #6 from spheee/demo

321
合并解决
Merge pull request #7 from spheee/demo

合并解决
更新配置
航班信息的添加和爆款抢购的详情中页
Merge branch 'demo' of github.com:CaoLeilei/tc-touch

Conflicts:
	app/assets/lib/config.js
	app/demo/detail/index.html
冲突解决
解决问题
测试修改