Merge branch 'master' of github.com:qiaomingzi/PortalSite

Conflicts:
	src/main/webapp/resource/themes/base/bootstrap.css
	src/main/webapp/resource/widget/css-norm.html
	src/main/webapp/resource/widget/index.html
	src/main/webapp/resource/widget/page-norm.html
Merge branch 'master' of github.com:qiaomingzi/PortalSite

Conflicts:
	src/main/webapp/resource/themes/base/bootstrap.css
	src/main/webapp/resource/widget/css-norm.html
	src/main/webapp/resource/widget/index.html
	src/main/webapp/resource/widget/page-norm.html