文字内容调整
Merge branch 'master' of https://github.com/One-Platform/example
Merge branch 'master' of https://github.com/One-Platform/example

Conflicts:
	showcase/src/main/webapp/static/layouts/header.jsp
	showcase/src/main/webapp/views/document.jsp
恢复历史版本