文字内容调整
Merge pull request #34 from shmilbin1570/master

修改jquery版本
Merge branch 'master' of https://github.com/One-Platform/example
Merge pull request #35 from shmilbin1570/master

升级至最新版
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
恢复历史版本
Merge pull request #36 from shmilbin1570/master

修改web.jsp
Merge pull request #37 from shmilbin1570/master

修改web请求路径
Merge pull request #13 from One-Platform/master

update