Merge of fix/websocket to develop 修改WebSocket连接的一些bug

See merge request o2oa/o2oa!207

Fix/buildpackage 修改编译文件，从download.o2oa.net下载jvm和commons

See merge request o2oa/o2oa!204

Merge of fix/org_access to develop 修改组织管理权限，修复RoleManager无法管理角色的问题

See merge request o2oa/o2oa!206

Merge of fix/[门户管理]修复部件设计脚本页面显示不正常的问题 to develop

See merge request o2oa/o2oa!205

Merge of feature/documenteditor_add_history_config to develop 版式正文痕迹保留增加是否允许查看痕迹配置

See merge request o2oa/o2oa!203

Merge of feature/documenteditor_history to develop [版式文件]正文痕迹保留和回放功能

See merge request o2oa/o2oa!201

Merge remote-tracking branch 'origin/feature/documenteditor_history' into feature/documenteditor_history

Merge of fix/[数据中心]修复表单中的视图加载完成后loading不消失的问题

See merge request o2oa/o2oa!202

# Conflicts:
#   o2web/source/o2_core/o2/xDesktop/WebSocket.js

Merge of fix/Query.view_search_condition[数据中心]修复一些条件没有正确显示的BUG

See merge request o2oa/o2oa!197

Merge of feature/Teamwork.taskMoveService工作管理新添加了一些服务

See merge request o2oa/o2oa!200

Merge of fix-privateperson增加个人通讯录查询组织权限配置设计

See merge request o2oa/o2oa!198

Merge of fix/BBS.acceptReplyDeleteError修复了已经采纳的解决方案回贴被删除后 ，主贴展示会出现回复不存在的报错的问题

See merge request o2oa/o2oa!199

Merge of hotfix/add_kity_min_js to develop 修复脑图中引入kity错误问题

See merge request o2oa/o2oa!196

Merge of hotfix/add_kity_min_js to master 修复脑图中引入kity错误问题

See merge request o2oa/o2oa!195

Merge of feature/[系统日志]增加日志分级标志 to develop

See merge request o2oa/o2oa!193

修改merge任务为combine,增加合并workLog,升级命令迁移到ddd中

See merge request o2oa/o2oa!194