导航改成一个页面
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/js/common-init.js