bug fix
dfdfMerge branch 'master' of https://github.com/iyjian/Web

Conflicts:
	routes/wap.js