更新layoutManager
save 5-14 work
fixed
Merge branch 'master' of https://github.com/smglg/myweb

Conflicts:
	public/app/modules/views/header.js
	public/app/router.js
Merge branch 'master' of https://github.com/smglg/myweb

Conflicts:
	public/app/modules/views/header.js
	public/app/router.js