8月14日上传的部分
Merge branch 'demo' of https://github.com/spheee/tc-touch into spheee-demo

Conflicts:
	app/modules/async/city/index.js
Merge branch 'spheee-demo' into demo