首页
Merge branch 'master' of https://github.com/ully/haitao

Conflicts:
	project/WebRoot/static/navigator.html