Merge pull request #2 from One-Platform/master

upload
文字内容调整
修改jquery版本
Merge pull request #12 from One-Platform/master

update
Merge pull request #34 from shmilbin1570/master

修改jquery版本
Merge branch 'master' of https://github.com/One-Platform/example
增加api包和web框架的api
增加forum.jsp
修改web.jsp
升级至最新版,暂时去掉没有的组件
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
恢复历史版本
修改web.jsp
Merge pull request #36 from shmilbin1570/master

修改web.jsp
修改web请求路径
Merge pull request #37 from shmilbin1570/master

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

download
Merge pull request #13 from One-Platform/master

update
删除不用的js